From b57af88ceaec43a846682a93842331dca4d2a312 Mon Sep 17 00:00:00 2001 From: Roger Pau Monne Date: Mon, 2 Jun 2014 17:08:08 +0200 Subject: [PATCH] configure: disable qemu-trad on FreeBSD systems by default MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roger Pau Monné Cc: Ian Jackson Cc: Ian Campbell Acked-by: Ian Campbell [ ijc -- ran autogen.sh ] --- tools/configure | 7 ++++++- tools/configure.ac | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/tools/configure b/tools/configure index ea2ad80db5..80a74e310d 100755 --- a/tools/configure +++ b/tools/configure @@ -1427,7 +1427,7 @@ Optional Features: --enable-blktap1 Enable blktap1 tools (default is DISABLED) --enable-qemu-traditional Enable qemu traditional device model, (DEFAULT is on - for x86, otherwise off) + for Linux or NetBSD x86, otherwise off) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -3756,6 +3756,11 @@ else enable_qemu_traditional="yes";; *) enable_qemu_traditional="no";; esac + case "$host_os" in + freebsd*) + enable_qemu_traditional="no";; + esac + fi diff --git a/tools/configure.ac b/tools/configure.ac index 89f1ac7f1d..282dbc4cd8 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -61,12 +61,17 @@ AX_ARG_DEFAULT_DISABLE([blktap1], [Enable blktap1 tools]) AC_ARG_ENABLE([qemu-traditional], AS_HELP_STRING([--enable-qemu-traditional], - [Enable qemu traditional device model, (DEFAULT is on for x86, otherwise off)]),,[ + [Enable qemu traditional device model, (DEFAULT is on for Linux or NetBSD x86, otherwise off)]),,[ case "$host_cpu" in i[[3456]]86|x86_64) enable_qemu_traditional="yes";; *) enable_qemu_traditional="no";; esac + case "$host_os" in + freebsd*) + enable_qemu_traditional="no";; + esac + ]) AS_IF([test "x$enable_qemu_traditional" = "xyes"], [ AC_DEFINE([HAVE_QEMU_TRADITIONAL], [1], [Qemu traditional enabled]) -- 2.30.2